merge trunk
authorK. Handa <handa@gnu.org>
Sat, 11 Jan 2014 14:22:26 +0000 (23:22 +0900)
committerK. Handa <handa@gnu.org>
Sat, 11 Jan 2014 14:22:26 +0000 (23:22 +0900)

Trivial merge